# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1496.1.17 -> 1.1496.1.18
#	 arch/ia64/pci/pci.c	1.37    -> 1.38   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/12/19	bjorn.helgaas@hp.com	1.1496.1.18
# [PATCH] ia64: Fix PCI root bridge resources to handle prior allocations.
# 
# (alloc_resources):  Use insert_resource(), not request_resource(), to
# allocate PCI root bridge windows.  This fixes the problem
# where root bridge window allocation fails because an early
# driver (like VGA) has already allocated things.
# --------------------------------------------
#
diff -Nru a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
--- a/arch/ia64/pci/pci.c	Sat Dec 20 00:39:00 2003
+++ b/arch/ia64/pci/pci.c	Sat Dec 20 00:39:00 2003
@@ -153,7 +153,7 @@
 	res->end = end;
 	res->flags = flags;
 
-	if (request_resource(root, res))
+	if (insert_resource(root, res))
 		return -EBUSY;
 
 	return 0;